Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Jan 2011 06:47:55 +0000 (22:47 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Jan 2011 06:47:55 +0000 (22:47 -0800)

Trivial merge